Fix swapped calloc() arguments.
authorkaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>
Wed, 19 Apr 2006 17:39:36 +0000 (18:39 +0100)
committerkaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>
Wed, 19 Apr 2006 17:39:36 +0000 (18:39 +0100)
Signed-off-by: Hollis Blanchard <hollisb@us.ibm.com>
tools/ioemu/keyboard_rdesktop.c
tools/libxc/xc_linux_restore.c

index a98df101493b6e1e97e8a96ed53b7a94239c5179..a660a5f9c9e830d55fa9a26db68c122c4b4ce2be 100644 (file)
@@ -75,7 +75,7 @@ static kbd_layout_t* parse_keyboard_layout(const char* language,kbd_layout_t* k)
     char* file_name=malloc(strlen(prefix)+strlen(language)+strlen(bios_dir)+1);
 
        if(!k)
-               k=calloc(sizeof(kbd_layout_t),1);
+               k=calloc(1, sizeof(kbd_layout_t));
        strcpy(file_name,bios_dir);
        strcat(file_name,prefix);
        strcat(file_name,language);
index ac17f41edbf19d1db2aa4445553585696659dc14..571f5fd839c61456ddd22b2768d90498172510d7 100644 (file)
@@ -183,9 +183,9 @@ int xc_linux_restore(int xc_handle, int io_fd,
 
 
     /* We want zeroed memory so use calloc rather than malloc. */
-    p2m        = calloc(sizeof(unsigned long), max_pfn);
-    pfn_type   = calloc(sizeof(unsigned long), max_pfn);
-    region_mfn = calloc(sizeof(unsigned long), MAX_BATCH_SIZE);
+    p2m        = calloc(max_pfn, sizeof(unsigned long));
+    pfn_type   = calloc(max_pfn, sizeof(unsigned long));
+    region_mfn = calloc(MAX_BATCH_SIZE, sizeof(unsigned long));
 
     if ((p2m == NULL) || (pfn_type == NULL) || (region_mfn == NULL)) {
         ERR("memory alloc failed");